Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve iCloud path checking #9066

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Conversation

AnonymousMister
Copy link
Contributor

@AnonymousMister AnonymousMister commented Aug 29, 2023

fix: icloud目录判断范围太广

icloud 目录匹配包含导致全局无法正常使用

  • Please commit to the dev branch
  • For contributing new features, please supplement and improve the corresponding user guide documents
  • For bug fixes, please describe the problem and solution via code comments
  • For text improvements (such as typos and wording adjustments), please submit directly

icloud 目录匹配包含导致全局无法正常使用
@github-actions github-actions bot changed the base branch from master to dev August 29, 2023 03:41
@github-actions
Copy link

Your PR was set to target master, PRs should be target dev
The base branch of this PR has been automatically changed to dev, please check that there are no merge conflicts

Copy link
Member

@88250 88250 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

有几个地方需要修改,麻烦看下。

app/electron/init.html Outdated Show resolved Hide resolved
app/electron/init.html Outdated Show resolved Hide resolved
@88250 88250 changed the title fix: icloud目录判断范围太广 Improve iCloud path checking Aug 29, 2023
@88250 88250 added this to the 2.10.3 milestone Aug 29, 2023
1.删除无用的else块
2.完善simpleCheckIcloudPath方法 添加 桌面 和文档的路径判断
@AnonymousMister AnonymousMister requested a review from 88250 August 29, 2023 12:59
@88250 88250 merged commit b0b7b6f into siyuan-note:dev Aug 29, 2023
@88250
Copy link
Member

88250 commented Aug 29, 2023

感谢贡献 ❤️

@88250
Copy link
Member

88250 commented Aug 29, 2023

对了,因为 golang 代码里面也有类似判断,麻烦用你的环境直接测试一下看看是否正常。

88250 added a commit that referenced this pull request Aug 29, 2023
@AnonymousMister
Copy link
Contributor Author

对了,因为golang代码里面也有类似的判断,麻烦用你的环境直接测试一下看看是否正常。

好的 我明天看看

@88250
Copy link
Member

88250 commented Aug 29, 2023

好的,直接在左上角主菜单中切换工作空间就可以测试了。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants